Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for Bookworm changes #73

Merged
merged 5 commits into from
Nov 6, 2023

Conversation

saiarcot895
Copy link
Contributor

@saiarcot895 saiarcot895 commented Sep 8, 2023

Update Python dependency list and test code for Bookworm, and break a cyclical dependency between this repo and sonic-buildimage.

For Python package builds, newer versions of pip/setuptools don't support test_requires, and the current standard is to specify any extra dependencies (such as those required for testing) under extra_requires. Therefore, specify the testing dependencies under extra_requires. These can be installed via pip using pip install '.[testing]'.

In the PAM config files, replace libpam-cracklib with libpam-pwquality, since the former has been removed from Bookworm.

Finally, updating PAM config files currently causes a cyclical dependency, since the templates are in sonic-buildimage, but the test output files are in this repo. This would mean that in order to make a change in the template that would affect the output, PR checks would fail. Fix this by moving the template files into this repo. References to the template files in sonic-buildimage would need to be updated to point to the files in sonic-host-services.

@saiarcot895
Copy link
Contributor Author

Depends on #74.

@saiarcot895 saiarcot895 marked this pull request as draft September 12, 2023 23:19
@saiarcot895 saiarcot895 force-pushed the fix-errors-for-newer-python branch from 98abd91 to 5226e2b Compare September 29, 2023 23:26
@saiarcot895 saiarcot895 changed the base branch from master to bookworm October 13, 2023 21:49
@saiarcot895
Copy link
Contributor Author

/azpw run

@mssonicbld
Copy link

/AzurePipelines run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@saiarcot895 saiarcot895 marked this pull request as ready for review October 19, 2023 22:33
@saiarcot895 saiarcot895 force-pushed the fix-errors-for-newer-python branch 2 times, most recently from c221a5d to d5d2cd8 Compare October 24, 2023 00:12
@saiarcot895 saiarcot895 marked this pull request as draft October 24, 2023 00:14
@saiarcot895 saiarcot895 force-pushed the fix-errors-for-newer-python branch 8 times, most recently from 7dd3210 to bd6baa7 Compare October 27, 2023 21:22
@saiarcot895 saiarcot895 changed the title Specify test dependencies under extra_requires Update for Bookworm changes Nov 2, 2023
@saiarcot895 saiarcot895 marked this pull request as ready for review November 2, 2023 23:34
@saiarcot895 saiarcot895 force-pushed the fix-errors-for-newer-python branch from bd6baa7 to 70c0fed Compare November 2, 2023 23:58
vdahiya12 and others added 3 commits November 2, 2023 17:08
…or DualToR config (sonic-net#82)

This PR is a required for changing the L3 IP forwarding Behavior to SoC in active-active toplogy.
Basically a src IP is added to the SNAT rule so that only packets originating from ToR with src IP as vlan IP get natted by the rule and change the src IP to LoopBack IP
However if there are mutiple vlan IP's we only add the source IP as vlan IP, for which the SoC IP belongs to, this PR adds that change.

How I did it
check the config DB if the ToR is a DualToR and has an SoC IP assigned.
put an iptable rule
iptables -t nat -A POSTROUTING --destination -j SNAT --to-source "

Signed-off-by: vaibhav-dahiya <[email protected]>
Newer versions of pip/setuptools don't support test_requires, and the
current standard is to specify any extra dependencies (such as those
required for testing) under extra_requires.

Therefore, specify the testing dependencies under extra_requires. These
can be installed via pip using `pip install '.[testing]'`.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895 saiarcot895 force-pushed the fix-errors-for-newer-python branch from 70c0fed to dacb526 Compare November 3, 2023 20:34
Debian Bookworm has removed libpam-cracklib; replace with
libpam-pwquality.

Signed-off-by: Saikrishna Arcot <[email protected]>
This repo's tests depends on files that are in
src/sonic-host-services-data in sonic-buildimage. Due to PR check
requirements, this creates a cyclical dependency when needing to update
the templates and the sample output files.

To fix that cyclical dependency, move that directory into this repo.
That way, both the templates and the sample output files can be updated
in a single commit.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Copy link
Contributor Author

@liushilongbuaa would you be able to review the pipeline-related changes here? This is removing a dependency on sonic-buildimage so that a cyclical dependency is broken.

liushilongbuaa
liushilongbuaa previously approved these changes Nov 6, 2023
Copy link
Contributor

@liushilongbuaa liushilongbuaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.
Take care for submodule HEAD updation.

@saiarcot895 saiarcot895 force-pushed the fix-errors-for-newer-python branch from dacb526 to db4bbf8 Compare November 6, 2023 17:48
@yxieca yxieca merged commit d5f76f7 into sonic-net:bookworm Nov 6, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants